Read this tutorial and solve the problem of resolving git merge conflicts in favor of pulled changes. Get overall understanding of Git merge strategies.